split & little fix