Bug fix for missing data