Fix value assignemt order