re-apply fix for #267