Fixed regex creation