Fix bug introduced with the last change