Convert #663285 to Flügger