And fixing that last fix