Correct fix for message system, now working properly