Fix generic instanciation