Fix for namespace collision (3)