Fix/overriding

Fixes missing overriding checks. Builds on #227. Review by @smarter