Attempt to fix issue #29