Fixes missing inheritance handling