Tried to fix the collision, failed and a small bit of code for the guard.

Look at the code...