See comments in the previous pull request about using return