fix storage locations