Fixed Issue #227