Fixed return to avoid colision