Convert #395438 to Flügger