Make splice more robust