modify regular for more robust to future change