follow up to db1faf5598, intial #4