Finally fixed enter-key bug