Fix support for singular model default values