Fix #345