More work on #21