Fix for non namespaced calls