Convert #389593 to Flügger