More fix for #841