fixed timeout bug
restored other messages