Fixed issue #2659