Issue 8

seems to have fixed issue-6 and issue-8