Resolve #2. Fix keypress eventlistener