Issue 241

This should solve Issue #241.