Integrate danmar's comment from pull request.