fixed traits so that collisions work properly