A more correct handling of the default value (OMS-444)