fixed ticket 2397