better disassembly support