Make DefaultValue consistent with the rest of the code