work on issue #1637