fixMessage added