Fix overwriting of defaults by undefined values.