fix cells so that they can be uniq'ed