Tried to fix the Enter issues