Corrected an assignment mess