fixed bug #55835 47896, 21478