better fix for #198