Possible fix for #200 and #105