Fixed Issue #239