temporary fix for #29