Fixed KDE to work with type-parameter refactor