3.0.3: only handle enter