more work on #1714