fixed issues with namespace