Fixed GetLocation