Issue #596