Fix assignment order
Merge pull request #501 from bellotastudios/assignment-order

Fix assignment order