I've just committed a possible fix for this, but it needs testing under a wider range of circumstances.
I've just committed a possible fix for this, but it needs testing under a wider range of circumstances.