Fixed splice and prepend to ensure attrs are carried forward