fixed pressing enter bug
merge