Fix logic to work with improperly commified user input