defensive-coding update for F21