Convert #367299 to Flügger