Fixed issue with namespace