Fix yesterday's patch so that it also works for the last flag. Still part of the fix for bug#40546.
Attach a file by drag & drop or click to upload
