Bugfix for namespace (Excpetion)