Convert #389455 to Flügger