re #7246 better now, but needs more tests and testing