Convert #623289 to Flügger