hot patch.. for #40