Fix escape problem