Fix splitting bug