security: Bug fixing

Change-Id: I809fb456c7759f925f28259d3967f49490dc2262