Quite probably fix issue #881
Merge pull request #887 from jrfnl/Double-check-deprecated

Quite probably fix issue #881