fix prepare