fixed location storage issue