fix defaults not setting non-nulls (related to #2)