Fix issue 652
Merge pull request #712 from godarklight/issue-652

Fix issue 652