@JonRowe appreciate you taking the time to have a look. No idea what happened, and no idea why I didn't catch something that obvious. Should be fixed in the next commit, care to check it out?

Maybe my solution is just bad in general though, it was just an attempt at fixing this