fixed some regex