Fix namespacing issue #2