Fixed issue #2560