making things better for #140 ...

... but not a fix