this version seems working fine

30611