Fixed namespace resolve