Zero and Null values persistence issue fix