Bug fix in accounting for multiplicity