Some small changes to try and figure out what is going on with issue #43.