Another fix
Added checking for bad override
And another fix