Merge pull request #8824 from annando/fix-coord