better fix for #2000 #2001 #1990