fix for namespace changes