Fix for #792