座標を修正
Merge branch 'hotfix/5.2'