fixed order of operations bug
Merge pull request #87 from smw1218/user_fix

fixed order of operations bug