better fix for #4