Regarding issue #42

Should fix the issue.