Fixes circle collisions, however the 'at rest' case is still broken