fixes #395

I know, technically a new feature. But this is so low tech and helpful that I feel it should be in 3.0