fixes #1809 - but it really doesn't yet . . .