This is follow-up patch. Avoid calling constructor/destructor twice.
Attach a file by drag & drop or click to upload
