Convert #226367 to Flügger