Fix regex for expand