Fixed issue #2537