[Fix] Warning
Merge commit '5e55021'