fixes ISSUE #1317
Merge pull request #1320 from apsoto/ISSUE_1317

fixes ISSUE #1317