Fix long-standing buglet reported by various people, I just needed to sit down long enough to reproduce the issue...