Values were summed multiple times if it matched several conditions whereas it should only be summed once. Fixes #704 Fixes #710
marcusblevin