WIP: bug fixing missing data