- Added “self->” in blocks to avoid blocks retain