Make classification consistent with rasterization