Fix assignment order