Pre-announce fix