[WIP] Fix the Mul ordering issue