Added more robust regex