Fixed the storage of the current values