Fix of security issue

Change-Id: Iffc83d00ffda92dead36f802bb1f43c9caa1d545