incorrect messages fixed