Yup, seems like you fixed it, all the scenarios in my comment work correctly now. Good job!
For the case that needs clarification, the third scenario was never buggy for me.
