And here is the other half of the previous commit (no idea, sorry)