better fix for #1959.