Fix prepare