Another fix for default values.