[fix] mantis #5798, second ttemp at correction

Change-Id: I5fc142d4edd42fdcda121095cf465ecb9a3c4014
Merge "[fix] mantis #5798, second ttemp at correction" into unstable