Fix issue with empty data