Fix bug introduced with namespace changes