Fix ticket 69