solved ticket 2513