Custom fix for vitelity state & ensure save on number doc