I'd rather prefer this solution for pull request #30