bug fix: #1656