Rewrite the non-multipart block splitter to be, you know, correct.