Fixed Issue #222