Fix serialize problem