[fix] mantis #5296

Change-Id: I41cc9c7c4b17aad5cffb2dc6eed90ec8566431e9
possibl fix for mantis #4312

Change-Id: Id51a19644ecc38fff09206fe422d38347aaa7e65