Fixed empty data processing