Fix for #832