dirty fix of UNDO