More work on fixing #19