Fix for #92
Fix for #99