Convert #623584 to Flügger