Work on #1035