Issue 236

This should solve Issue #236.