Fix issue 194

Completes and fixes #194