Fixed issue #2535