Fix generic for 1.6