Fixed a few spliting bugs
Fixed bugs