Fix bug with empty namespace