Issue 216

This should solve Issue #216.