Fix missing data bug