Fix another regression of last commit