Fix possible problem with input parsing