fixing support for user-supplied defaults