diff --git a/packages/pinball_components/lib/src/components/alien_bumper/alien_bumper.dart b/packages/pinball_components/lib/src/components/alien_bumper/alien_bumper.dart
index d8c75c69..73daa3d5 100644
--- a/packages/pinball_components/lib/src/components/alien_bumper/alien_bumper.dart
+++ b/packages/pinball_components/lib/src/components/alien_bumper/alien_bumper.dart
@@ -73,6 +73,8 @@ class AlienBumper extends BodyComponent with InitialPosition {
 
   final double _minorRadius;
 
+  // TODO(alestiago): Consider refactoring once the following is merged:
+  // https://github.com/flame-engine/flame/pull/1538
   final AlienBumperCubit bloc;
 
   @override
diff --git a/packages/pinball_components/lib/src/components/google_letter/google_letter.dart b/packages/pinball_components/lib/src/components/google_letter/google_letter.dart
index f460031c..2a253b7f 100644
--- a/packages/pinball_components/lib/src/components/google_letter/google_letter.dart
+++ b/packages/pinball_components/lib/src/components/google_letter/google_letter.dart
@@ -24,6 +24,8 @@ class GoogleLetter extends BodyComponent with InitialPosition {
           ],
         );
 
+  // TODO(alestiago): Consider refactoring once the following is merged:
+  // https://github.com/flame-engine/flame/pull/1538
   final GoogleLetterCubit bloc;
 
   @override
diff --git a/packages/pinball_components/lib/src/components/sparky_bumper/sparky_bumper.dart b/packages/pinball_components/lib/src/components/sparky_bumper/sparky_bumper.dart
index ffe5ff58..45e33119 100644
--- a/packages/pinball_components/lib/src/components/sparky_bumper/sparky_bumper.dart
+++ b/packages/pinball_components/lib/src/components/sparky_bumper/sparky_bumper.dart
@@ -89,6 +89,8 @@ class SparkyBumper extends BodyComponent with InitialPosition {
   final double _majorRadius;
   final double _minorRadius;
 
+  // TODO(alestiago): Consider refactoring once the following is merged:
+  // https://github.com/flame-engine/flame/pull/1538
   final SparkyBumperCubit bloc;
 
   @override