Fixed issue #2575