Convert #438369 to Flügger