fix no data + existing data