SurfaceSet bug fixed