More fix for #864