Fix no-data issue