Working on #1084.