Fix for existing data.