Fix no data problem