Fix #341