[12380] Improve [12371]. Thanks to rsa for pointing