Convert #388397 to Flügger