Convert #623542 to Flügger