In-class fixes: it works (ish).