Possible fix for #107
Fix for #108