Fix location storage bug