Fixed regex for option type deduction