Fixed issue #3187