ENH: Fix surface checking