add control for enter event (BUG