Fix user location not being fetched correctly