Convert #477438 to Flügger