Data structure fix; Label assignment fix