Fixed #194