Convert #623527 to Flügger