Fixed wrong messages