Fix for noop override
Fix for noop override