While we agreed that there might be a more principial way of solving this,
this solution was fast to add and it is pretty efficient for now.