Buildfix I left out from my upstream merge