Fix #347