[Fixed] mantis 5099

Change-Id: Ifa1d26bf77e69026ed96b93c137c9c9d1a10ddcf