Proposed fix for #844
Merge pull request #846 from ultraklon/modification5

Proposed fix for #844