Some fix
For extracting messages