Fixed split issue