Fixes yesterday's merge of Kostya's fix for ticket #409.
Attach a file by drag & drop or click to upload
