fixed colision bug