Fix location id bug