Move this fix to orc