Fix default value assignation