Working on #334.