Minor fix: some initialization process