fixed storage code