[fixed] mantis 5254

Change-Id: I2ed59a69991f9e739f4cb0c0efff0a5b6d884d12