The last changes for the draw options had a side effect on SURF3