Bugfix persist data through update