better disassembly
another small fix for disassembly