After some help on the investigation part and knowing where to fix it in the code, I wrote the code myself :). Also improved my fix due to advice in a code review. After that deployed it to test and prod > all green!