fixed input issues