Convert #395324 to Flügger