Fixing issue #30 and #32

Sometimes the reporting does some weird things, but it doesn't seem to be in my code.