Fixed Split and Insert (again)