Some changes in Disassemble method