Fixing whatever @cedricpim broke