Fix issue #669
Merge pull request #670 from cristianoc72/issue-669

Fix issue #669