Fixed getting location after merge with WT