fix for incorrect messages