f1a8db5b47
I had already fixed this on the dev branch, backporting because it's gonna take a while until it's released