Convert #623561 to Flügger