more work to fix issue shown in 09dfc11b5dfd