Namespace violation fix.