Fixed #346