Wip/opcmp fix