Fix user input issue