make things work on 5.16+ (bug #72708)