Fixed issue #2788