patch; also make the code logic a bit more self-consistent.
Attach a file by drag & drop or click to upload
