Add the missing fix from the last commit