Attempt to fix issue #366.