Convert #388361 to Flügger