Merging bugfix for 744
Merge pull request #909 from alterm4nn/bugfix744_edit

Merging bugfix for 744