I was told in other pull request to do it this way