Issue 194

Fix issue #194