Working on #109.