make things work on 5.16+ (bug #72708)
Merge pull request #2 from mauke/master

make things work on 5.16+ (bug #72708)