Attempt at fixing regex