Convert #347354 to Flügger