[fix] Mantis #4960

Change-Id: I06340474985267629d20b23ec62cb7d99017e584