Fix API when no location