Fix for undo/redo and sub-picking.