SurfacePaintEngine fixed