Fix #274

See my previous comment and see that tests are passing. In fact, not sure where this adds are being tested cause the tests add an analysis and test that those are OK.