Fix for ESC