Fix for namespace collision (2)