Fix no-data option