Existing data checking bug fixed.