fix for on enter event
fixes for on enter