ors: fix code fails (DO NOT MERGE YET)