Fixed not blocking undo/redo sometimes