Small bug fix, adjust message count