bug fix: issue #1371