Fixed issue #194