Convert #623295 to Flügger