Fix generic issue