Fixed bug #101221