Fixing the invalid XY.
Merge branch 'dev'