Another attempt to fix Location initialization