diff --git a/exercises/bundle.sh b/exercises/bundle.sh
index 0f128af..a165d55 100755
--- a/exercises/bundle.sh
+++ b/exercises/bundle.sh
@@ -57,7 +57,7 @@
 die_if_not_set AMI "Failure registering $BUCKET/$IMAGE"
 
 # Wait for the image to become available
-if ! timeout $REGISTER_TIMEOUT sh -c "while euca-describe-images | grep '$AMI' | grep 'available'; do sleep 1; done"; then
+if ! timeout $REGISTER_TIMEOUT sh -c "while euca-describe-images | grep $AMI | grep -q available; do sleep 1; done"; then
     echo "Image $AMI not available within $REGISTER_TIMEOUT seconds"
     exit 1
 fi