Convert #395629 to Flügger