temporary fix to the storage problem