Merging a pull request to make it work