Made overrides more reliable