This seems pretty important due to the double-counting problem. Does anyone know if it would be a difficult fix?