Fix issue #2072