Fixed issue #3057