Fix issue with missing data