Default value assignment bug fix