Fixes the failing test case in #1815. Added a test that would otherwise fail without the change.
Attach a file by drag & drop or click to upload
