Actually fix the problem I have in my own fork :-)