Ok, this is the fixed and tested variant that also fixes the bug that the previous trivial fix exposed.
Attach a file by drag & drop or click to upload
