Convert #389489 to Flügger