Work on #1298