experimental fix for #24