Fixes #148, but not in a nice way. We'd like to have the namespaces separate - but it'll do for now.