maybe fix for #1857