Fixed the ESC-Bug.