use a more strict check for opt_nonGeometry