Fix overriding code