hotfix for breaking up location field update
Merge pull request #254 from mvexel/master

hotfix for breaking up location field update