Fix issue #2016