Fix ticket 4746