changing namespaces and re-applying cvollmann's fix