with luck this will fix issue #61 and issue #62 - boy that was fun (not).