[c2798] Improve [c2795]

Thanks rsa for pointing

(based on commit bd3a0e0)