Fix #347
Fix an oversight.
Fix #351