Fix tract ticket 17018