Made a pull request here #1393