fix ticket 2281