Work around garbage collection issue

Change-Id: I91f93d5a8df1d2dd1d71abd66720c0d5e4828700