Attempt to fix issue #130.