Fixing issue where values would get wiped out if not entered each time.