fixed ticket 2712