Fixed namespace variables issue.