Fixed this regex as well