Convert #389368 to Flügger