Fixed namespace regression issue