Fix resolve namespace