Fix regression on types