Fix for namespace definition