Pull request: #1656 small fix