fix ticket 2693