Parser added to fixMessage