Issue #578 fix