More fix for #976