Use existing methods instead of incorrect maths.
Merge pull request #875 from eightyeight/fix-tsshape-bounds-collision

Use existing methods instead of incorrect maths