better fix for #89