work on #1721