Quite probably fix issue #881