Fixed data removal issue