WIP (FIX): fix problem with missing values in table