Small fix for location awareness