Fix split bugs