work on #1656