Fix issue #2017