This should fix the issue refs #725.
Merge pull request #726 from capooti/issue-725

This should fix the issue refs #725.