Correct of bug due to namespaces