Fixed issue with user input parsing