Fix bug introduced with last commit