Fix ticket 30