Thinking about that, I will make a new issue for that and fix it separately so it's more clear what happened.