Fix Issue 1003
Merge pull request #1003 from Sophist-UK/fix_issue_1002

Fix issue 1002