added support for empty default values