Convert #362085 to Flügger