Fixed the split issues