Fix assignment tag uniqueness