Fix ticket 38