Work on #329