Fixed Issue #242