issue #225, still needs to be made undoable