Minor data organization fix