Issue #245