expanded regexp fix