Fix issue: overflow value will be removed instead of removing old data