Fixing a Warped Surface