Fixing escape handling for GPU variant