MAP-964: deal with GC issue.