Fixed problem with missing default values.