Fixed issue #2572