Slightly less buggy collision avoidance