diff --git a/PBot/AntiFlood.pm b/PBot/AntiFlood.pm
index 336ff4f9..fb518277 100644
--- a/PBot/AntiFlood.pm
+++ b/PBot/AntiFlood.pm
@@ -224,7 +224,7 @@ sub add_message {
   }
 
   # keep only MAX_NICK_MESSAGES message history per channel
-  if($length >= $self->{pbot}->{MAX_NICK_MESSAGES}) {
+  while($length >= $self->{pbot}->{MAX_NICK_MESSAGES}) {
     my %msg = %{ shift(@{ $self->message_history->{$account}->{channels}->{$channel}{messages} }) };
     #$self->{pbot}->logger->log("shifting message off top: $msg{msg}, $msg{timestamp}\n");
     $length--;
diff --git a/PBot/VERSION.pm b/PBot/VERSION.pm
index 28daf378..2c8915c8 100644
--- a/PBot/VERSION.pm
+++ b/PBot/VERSION.pm
@@ -13,8 +13,8 @@ use warnings;
 # These are set automatically by the build/commit script
 use constant {
   BUILD_NAME     => "PBot",
-  BUILD_REVISION => 564,
-  BUILD_DATE     => "2014-05-01",
+  BUILD_REVISION => 565,
+  BUILD_DATE     => "2014-05-04",
 };
 
 1;