Suggested fix for #739