Fix for defaults overwriting set values.