fix 2 bugs: one new introduced by merge develop, one introduced by extra change asked in code review
Attach a file by drag & drop or click to upload
