I go to bed...
Fixed ESC bug again
Merge commit '64fc2321640ccfee675973ffdfd7e34451f36f11' into issue70