Convert #367126 to Flügger