Issue #593