Issue 199

This should solve Issue #199.