Fixed bundle handling in function splitter