Correction for order of variable assignment.