Fix for SelectSurface value change