fixed faulty messages