Hurr durr.
Fixes:
Drawing.
(cherry picked from commit 08fe86f)
Bug fixed
Added NaN checks in collision detection