i think this should fix the previous problem of not proper storage