fixed horrible collosion bug