fix messages again