Fix issue #2019