fix bug with input box
merge changes