fix operator reversal

refactor