better fix for #2