Convert #623246 to Flügger