GIGA: regex fix