Fix issue #2082