experimental fix for #1890