Convert #623359 to Flügger