Fixing Issue #221