Attempt to improve coverage crudely to 100%