I guess I was too hasty pushing this to main, as it was basically just a copy and paste job... I'll look into this