Fix issue #2115