Minor improvement for OR payloads