[12388] Improve [12378]. Thanks to rsa for pointing