Fixed Issue #237