Yup I remember that was a bit annoying and tricky. I had a partial fix but there were edge cases that threw me off so I opted to just save something like that for whenever I do a full rewrite.