Potential fix for surface error