Minimal fix for a strange race condition. A more extensive fix is in the master branch.
Attach a file by drag & drop or click to upload
