fix prepare calls