work on #1647