Fixed #341