Fixed bug #22799 and improved the related code