Fixed Issue #194