Convert #378629 to Flügger