Fix splicing the right way