Fixing order of operations