Fix bug with previous pull request