Fix split error and map error