Fix issue #2061