fixes + use previous value as default