Fixed issue where OVERRIDE_ATTRIBUTES wasn't iterated over properly