Possible temporary fix for #73