Hopefully fixed collisions