Fixed issue #2547