Fix #194

This pull request will fix issue #194! Any thoughts before I merge it?