Fixing up regex