Convert #623275 to Flügger