Should prevent issue fixed by previous commit to happen again (since read code, especially in undo case, is not really straight forward to follow anymore).
Should prevent issue fixed by previous commit to happen again (since read code, especially in undo case, is not really straight forward to follow anymore).