diff --git a/eth2/beacon/epoch_processing_helpers.py b/eth2/beacon/epoch_processing_helpers.py
index 3444e7a028..5be09314b2 100644
--- a/eth2/beacon/epoch_processing_helpers.py
+++ b/eth2/beacon/epoch_processing_helpers.py
@@ -94,9 +94,9 @@ def _filter_attestations_by_latest_crosslinks_and_shard(
         shard: Shard) -> Iterable[PendingAttestationRecord]:
     for attestation in attestations:
         is_latest_crosslink_matched = attestation.data.previous_crosslink == latest_crosslink
-        # is_shard_matched = attestation.data.shard == shard
-        # TODO: Now use the wrong one for fixture tests, need to change it back in v0.6.0
-        is_shard_matched = True
+        # NOTE: v0.5.1 doesn't check is_shard_matched but it's fixed in v0.6.0
+        # We implemented ahead here.
+        is_shard_matched = attestation.data.shard == shard
         if is_latest_crosslink_matched and is_shard_matched:
             yield attestation