Temp REGEX fix