maybe fix for #1619