Attempt to fix issue #3235