-Fixed Esc trigger bug