Fixed to work with CGExtensions 1.18 series.