#14 fix getLocation