Proposed fixes for Issue 13547.

> usually it is never ...

Doesn't sound good.
P.S. pull #666, very nice :)