Fixing up data status