Major bug: old dictionary should have been rewritten in terms on equality