Fixed issues with input.