Convert #623265 to Flügger