Fixed #347