simplifying the condition checking for object overrides. #1089