Fixed issue #347