Collision fix & jumpfix