Proposed fix for #814
Merge pull request #845 from ultraklon/modification4

Proposed fix for #814