Attempt to fix issue #229.