Fixed bug with namespace