Fix for #835