Fixed #332