I'l test/post later, but you can try changing AddTo 1 to AddTo 0 in the files that have it and that should fix.
