Fixed every message bug left