Fixed issue #3091