Working on #442.