proposed hotfix [#83464432]

@jdevalk the fix works, but I am not sure if this is the best possible solution. Please take a look.