More work on #75