Fixed issue with END key