Fixing security issue

Change-Id: I0bada3aaf375c76d66436e1375458732ed5cfd7c