Fixes CoordinateSurfaces implementation to correctly handle objects