[2794] Imporve [2791]

Thanks rsa for pointing