Bug fix: undo