Fixing order of operations issue