Bugfix for missing data