bug fix: issue #1036