Fixed Issue #221

fixes #221