Fix v4.45 issue