This can be fixed by the drivers paying extra attention in front of them when entering a roundabout.

When you enter a roundabout you need to be clear from the left, that's normally all you need to worry about. In this case because the buses are so long, the bus that locks them is in front of them when they enter, and there's another bus to the right. This should be clearly visible.