Issue #240