Fixed undo stack + bom