bug fix: issue #1581