solved ticket 2721