More work on #197