Fixing issue: Problem while back the data to initial values