Fixed logic so messages don't repeat (got over zealous on that last commit).