[Fixed] mantis 3381

Change-Id: I4585d6e92186839911462afaa73d9fa8763c9b2b