Convert #623674 to Flügger