Fix types definition issue