fixed ticket 2575