Bad data structure corrected