Convert #438697 to Flügger