Convert #438287 to Flügger