Convert #623673 to Flügger