Bugfix: storage was not saving the last state, force the save on scan complete