Minor change to input handling