final storeable fix