Fixed another namespace-related bug