Fix regression from my previous commit