bug fix: issue #1486