fix: cope better with missing data