WA
solved, but dirty
fixed to use center of gravity
Merge branch 'feature-2442'