Fixed bad_alloc issue when using one message per second
Although we don't have a better fix for now, it should be a good idea to merge this branch before we forget it.
Although we don't have a better fix for now, it should be a good idea to merge this branch before we forget it.