Fixed using regex