Issue #618