Attempt to fix issue #794