Fix strong self reference in blocks