Redid fix for #2683