Fixed a major wierd bug which was creating empty messages