[Fixes: 47449041] Some Fix.