Change will be in my next pull request