Fixed collision detection after restart