Use regex instead