Fixed issue #2388