Possible fix for issue 2
Credit in history
Merge branch 'issue_2'