Fixed strange namespacing/path issue.. somehow?