a quick fix for the wrong messages