Attempt to fix issue #7