Possible fix to #8 will debug with @mikeumus