[TW304] Attempted QC fix