Fixing bug with existing data