Issue 213

This should solve Issue #213.