Temp remove regex check