work on #1645