Issue 206

This should solve Issue #206.