Fix surface selection