[Fixed] Mantis #5343

Change-Id: I1e866cfe3a8b396f7d0f10877b0b3069f2ffd7e0