Fix for #99