LocationHelper improved