Fix regexp for 5.18+