More work on #22