Fixed issue with confusion of user variables.