Bug fixing, reset collision detection