Fix the previous fix on undo