collison fixes