Fixed overriding bugs