experimental fix for #804