R2D2 fixed again