Possible Memory Leak

Change-Id: I6658e540f223dbe5d62db29a4fdb2e554987630d