Other half of eta-check fix.