Fixed: Removed unnecessary logic in afterFetch