Fix issue #2484