gh-786

Additional fix for #786