Bug removal from input parsing