Fix issues with enter introduced with c7a79fe, 45a53948

related #22