Fixed bug with message tail