FIX regexp for 17.0-rc1