fixed issue where location was being put into wrong field
Merge remote-tracking branch 'origin/master'