Fixed Issue #225