Fixed issue #2742