Fixed possible GC crash