I tried to fix it on my own and make a PR but honestly I'm really not that good in GoLang, I'll try to dig a bit on it but it is probably better to not expect a lot from me haha