Fix for #919