Bug fix issue #31 stuck in first 10 messages