commit #347