Fix previous pull request