Fix #419 Issue
Merge pull request #420 from ovr/419_issue

Fix #419 Issue