bug 47 maaaaaybe fixed
bug 47 hopefully fixed