Fixed multiplicity issue (part 2)