fix ticket 2237