I have tried to fix this but as I am not able to reproduce this locally I am at a loss here. Maybe someone else has an idea...