Fix for #114