More hot-fixing