more work on #721